# This is a BitKeeper generated patch for the following project: # Project Name: Linux kernel tree # This patch format is intended for GNU patch command version 2.5 or higher. # This patch includes the following deltas: # ChangeSet 1.676.12.1 -> 1.676.12.2 # arch/ia64/kernel/iosapic.c 1.6 -> 1.7 # # The following is the BitKeeper ChangeSet Log # -------------------------------------------- # 02/09/27 t-kouchi@mvf.biglobe.ne.jp 1.676.12.2 # ia64: Fix iosapic debug code. # -------------------------------------------- # diff -Nru a/arch/ia64/kernel/iosapic.c b/arch/ia64/kernel/iosapic.c --- a/arch/ia64/kernel/iosapic.c Wed Oct 8 09:10:00 2003 +++ b/arch/ia64/kernel/iosapic.c Wed Oct 8 09:10:00 2003 @@ -590,7 +590,7 @@ gsi_base, addr); DBG("ISA: IRQ %u -> GSI 0x%x(%s,%s) -> CPU 0x%04x vector %d\n", - isa_irq, global_vector, + isa_irq, gsi, polarity ? "high" : "low", edge_triggered ? "edge" : "level", dest, vector); @@ -661,7 +661,7 @@ register_intr(gsi, vector, IOSAPIC_LOWEST_PRIORITY, 0, 0, gsi_base, addr); - DBG("PCI: (%02x:%02x:%02x:%02x INT%c) -> GSI 0x%x -> vector %d\n", + DBG("PCI: (%02x:%02x:%02x INT%c) -> GSI 0x%x -> vector %d\n", segment, bus, slot, 'A' + pci_pin, gsi, vector); }